Hibernate: adding merge and update tests