Merge pull request #2 from alanraison/master

A couple of pieces of tidying up
Changing test database to in memory h2
Merge branch 'in-mem-test-db'