Fix up broken test.  Strip unnecessary Spring context and just run with mocks