Fix makefile
Update tests for controller
Update test
Refactoring test folders