Import Bebe's migration to app object for Marketplace tests

This pull picks out the code that @bebef1987 wrote to migrate these tests to use the app objects so full credit to him.
I reviewed his code already so this has r+ from me, just needs one more.