Cleaned up unit tests in controllersSpec and serviceSpec