pass marketplace settings tests
make the tests run faster
Merge pull request #706 from daliwali/tests

Make tests run faster