Fixed some breakage from the tear down/migration to steps in megatest.db