[#ARCH-157] Create a DBUnit/HSQLDB integration test; minor test cleanup.