Updated to new version of spring-test