committing before rebasing this time
fixed my git mistakes manually
Merge pull request #115 from CombustibleLemons/ctrl-tests-refactoring

Ctrl tests refactoring