Updated jpa entities. Added integration test