optimize/fix TestMarketplace tests