Refactored some classes and removed test methods.  Also implemented new context loading strategy in tests so that I'm only overwriting the one dataSource bean.