OZP-708: Improve Marketplace Intents conversion and testing