Fixed problems with Spring test contexts