diff --git a/lib/WebGUI/Upgrade.pm b/lib/WebGUI/Upgrade.pm
index 5339da94e..cff43a30d 100644
--- a/lib/WebGUI/Upgrade.pm
+++ b/lib/WebGUI/Upgrade.pm
@@ -346,7 +346,7 @@ sub runUpgradeFile {
     my ($configFile, $version, $filename) = @_;
     my $has_run = $self->_files_run->{ Cwd::realpath($filename) } ++;
 
-    try {
+    return try {
         my $upgrade_class = $self->classForFile($filename);
         my $upgrade_file = $upgrade_class->new(
             version     => $version,
@@ -361,12 +361,12 @@ sub runUpgradeFile {
     catch {
         when (/^No upgrade package/) {
             warn $_;
+            return;
         }
         default {
             die $_;
         }
     };
-    return;
 }
 
 =head2 classForFile ( $file )
diff --git a/t/Upgrade.t b/t/Upgrade.t
index 68bbb0e5d..c184e1386 100644
--- a/t/Upgrade.t
+++ b/t/Upgrade.t
@@ -24,7 +24,7 @@ use Capture::Tiny qw(capture);
 local *WebGUI::Paths::siteConfigs;
 local *WebGUI::Paths::upgrades;
 
-our $configFile = WebGUI::Test->config->getFilename;
+our $configFile = WebGUI::Test->config->pathToFile;
 {
     no warnings 'redefine';
     *WebGUI::Paths::siteConfigs = sub { $configFile };
diff --git a/t/supporting_collateral/Upgrade/config.pl b/t/supporting_collateral/Upgrade/config.pl
index 386d01a1e..0629f3905 100644
--- a/t/supporting_collateral/Upgrade/config.pl
+++ b/t/supporting_collateral/Upgrade/config.pl
@@ -1,3 +1,3 @@
 use WebGUI::Upgrade::Script;
-::is config->getFilename, $::configFile, 'config function works correctly';
+::is config->pathToFile, $::configFile, 'config function works correctly';
 
diff --git a/t/supporting_collateral/Upgrade/output.pl b/t/supporting_collateral/Upgrade/output.pl
index 02363c47a..88e15a27c 100644
--- a/t/supporting_collateral/Upgrade/output.pl
+++ b/t/supporting_collateral/Upgrade/output.pl
@@ -1,5 +1,5 @@
 use WebGUI::Upgrade::Script;
-report 'Simple Output';
+start_step 'Simple Output';
 
 done;
 
diff --git a/t/supporting_collateral/Upgrade/package.pl b/t/supporting_collateral/Upgrade/package.pl
index e5d483fd1..fd9b00918 100644
--- a/t/supporting_collateral/Upgrade/package.pl
+++ b/t/supporting_collateral/Upgrade/package.pl
@@ -1,5 +1,5 @@
 use WebGUI::Upgrade::Script;
-::addToCleanup(version_tag);
+::addToCleanup('WebGUI::VersionTag', version_tag->getId);
 
 import_package('test-template.wgpkg');
 
diff --git a/t/supporting_collateral/Upgrade/versiontag-implicit.pl b/t/supporting_collateral/Upgrade/versiontag-implicit.pl
index cddcf0cda..4d0717933 100644
--- a/t/supporting_collateral/Upgrade/versiontag-implicit.pl
+++ b/t/supporting_collateral/Upgrade/versiontag-implicit.pl
@@ -7,7 +7,7 @@ WebGUI::Asset->getRoot(session)->addChild({
 });
 my $vt = WebGUI::VersionTag->getWorking(session, 'nocreate');
 if ($vt) {
-    ::addToCleanup($vt);
+    ::addToCleanup('WebGUI::VersionTag', $vt->getId);
 }
 $vt;
 
diff --git a/t/supporting_collateral/Upgrade/versiontag.pl b/t/supporting_collateral/Upgrade/versiontag.pl
index 9277a9757..8515213cd 100644
--- a/t/supporting_collateral/Upgrade/versiontag.pl
+++ b/t/supporting_collateral/Upgrade/versiontag.pl
@@ -1,6 +1,6 @@
 use WebGUI::Upgrade::Script;
 my $vt = version_tag;
-::addToCleanup($vt);
+::addToCleanup('WebGUI::VersionTag', $vt->getId);
 
 ::isa_ok $vt, 'WebGUI::VersionTag';
 ::is $vt->get('name'), 'Upgrade to 8.3.0 - versiontag', 'auto-naming with short name works';
@@ -9,7 +9,7 @@ my $vt = version_tag;
 ::ok ! $vt->get('isCommitted'), '... and doesn\'t commit version tag';
 
 my $vt2 = version_tag 'Adding This Stuff';
-::addToCleanup($vt);
+::addToCleanup('WebGUI::VersionTag', $vt2->getId);
 ::ok $vt->get('isCommitted'), 'Request for new version tag commits previous tag';
 ::is $vt2->get('name'), 'Upgrade to 8.3.0 - Adding This Stuff', 'explicit name used correctly';