Fix failing test cases (new version of Spring)