Updating DAO methods to work with H2

Fix for issue #36. Addresses failing test cases when using H2.