MarketPlace testing updated. Cleanup in MarketPlace