Fix controller test and created a service test