Update controllers tests
Cleanup tests classes
Cleanup