Hibernate Mapping updates + test