Improve Marketplace management tests