Set controllers as services and added unit tests