Cleaned up spring-testcontext.xml