Create some sample integration tests; tidy up package names; remove obsolete code; reinstate HSQDL