refactor tests for controllers & services