Merge pull request #909 from zacc/reenable_marketplace_tests

Re-enable the Marketplace tests after bugs 875261, 874337 resolved.