Subclass from AbstractBaseControllerTest for all (integration) tests that require loading of Spring context. This removes duplication of context configuration as well. Formatting cleanup in some tests.
Improve test class hierarchy so that service tests do not have to extend the controller test base class.