diff --git a/t/Asset/File.t b/t/Asset/File.t
index b2e0a995a..36e08aa94 100644
--- a/t/Asset/File.t
+++ b/t/Asset/File.t
@@ -12,6 +12,11 @@ use FindBin;
 use strict;
 use lib "$FindBin::Bin/../lib";
 
+use Test::MockObject;
+my $mocker = Test::MockObject->new();
+$mocker->fake_module('WebGUI::Form::File');
+$mocker->fake_new('WebGUI::Form::File');
+
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Storage;
@@ -21,7 +26,7 @@ use Image::Magick;
 
 use Test::More; # increment this value for each test you create
 use Test::Deep;
-plan tests => 7;
+plan tests => 9;
 
 my $session = WebGUI::Test->session;
 
@@ -66,9 +71,16 @@ is($storage->getId, $asset->getStorageLocation->getId, 'Cached Asset storage loc
 
 $versionTag->commit;
 
+my $fileStorage = WebGUI::Storage->create($session);
+$mocker->set_always('getValueFromPost', $fileStorage->getId);
+my $fileFormStorage = $asset->getStorageFromPost();
+isa_ok($fileFormStorage, 'WebGUI::Storage', 'Asset::File::getStorageFromPost');
+isnt(ref $fileFormStorage, 'WebGUI::Storage::Image', 'getStorageFromPost does not return an image storage object');
+
 END {
 	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
 		$versionTag->rollback;
 	}
 	##Storage is cleaned up by rolling back the version tag
+    $fileStorage->delete;
 }
diff --git a/t/Asset/File/Image.t b/t/Asset/File/Image.t
index a2f6559bd..53bc71607 100644
--- a/t/Asset/File/Image.t
+++ b/t/Asset/File/Image.t
@@ -12,6 +12,11 @@ use FindBin;
 use strict;
 use lib "$FindBin::Bin/../../lib";
 
+use Test::MockObject;
+my $mocker = Test::MockObject->new();
+$mocker->fake_module('WebGUI::Form::Image');
+$mocker->fake_new('WebGUI::Form::Image');
+
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Image;
@@ -22,7 +27,7 @@ use Image::Magick;
 
 use Test::More; # increment this value for each test you create
 use Test::Deep;
-plan tests => 7;
+plan tests => 8;
 
 my $session = WebGUI::Test->session;
 
@@ -69,9 +74,15 @@ is($storage->getId, $asset->getStorageLocation->getId, 'Cached Asset storage loc
 
 $versionTag->commit;
 
+my $imageStorage = WebGUI::Storage::Image->create($session);
+$mocker->set_always('getValueFromPost', $imageStorage->getId);
+my $imageFormStorage = $asset->getStorageFromPost();
+isa_ok($imageFormStorage, 'WebGUI::Storage::Image', 'Asset::Image::getStorageFromPost');
+
 END {
 	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
 		$versionTag->rollback;
 	}
 	##Storage is cleaned up by rolling back the version tag
+    $imageStorage->delete;
 }