Added tests for controllers and services