Bug 997951 - [marketplace-tests-gaia] Clean up and bolster some tests which are failing intermittently

Add compatibility with current gaiatest
Merge pull request #32 from bobsilverberg/current_gaiatest

Bug 997951 - [marketplace-tests-gaia] Clean up and bolster some tests which are failing intermittently