Centralize Junit tests around the Controllers. Removed the Service layer
tests as the controllers invoke them.
Tests should be testing as much code as possible.