OTA test refactorings