unit fixes and working on hibernate groovy passing tests