Add unit tests for Controllers