OZP-648: Fixing functional tests