Controller tests
JUnit tests ok
Merge remote-tracking branch 'origin/ControllerTests'