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

pass marketplace tests