First attempt to fix failing hibernate tests