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