Tests speed up

changed tests so that they run faster. I believe I was able to shave off at least a couple minutes off the total run time. The bad news is that I believe the largest bottleneck is refreshing the application context each time we start a test suite, so it might  be possible to speed things up further by removing that and using only mocks.