Fixed broken Spring JPA tests.
Merge branch 'fix-sping-tests' into wordset-parser