Controllers tests clean up

- Cleaned up controllers tests code base.