Added unit tests for controllers and services