more refactorings of the test cases to further simplify them. Also made the SpringTestSupport derive from the ContextTestSupport so we can reuse all of the helper methods on ContextTestSupport