OZP-16 Controller test updates