Nearly there with hibernate tests