tidy up
hibernate integration tests beefed up