removed dependency to spring-test and added some other small optimizations