Ctrl tests refactoring