remove uses of org.hibernate.mapping.Collection
fix NPE during test run