Add tests to controllers
Merge branch 'feature/controllers_tests' into develop