Changes so that the JPA tests also work for xcore models