Repairing tests after Spring and Hibernate upgrade