Moved around controller and service declarations
Fixing unit tests