Updated HSQL version
 Removed unused code
 Added additional unit test on service
 Changed entity primary key type
 Added import.sql to test