Fix Controllers tests
Add Utils module
Fix tests