Updated SQL script and tests for Spring data.