Changed JPA model & tests

Change-Id: I065f1b6d562f4a0af9a8ef31fdb7dc86ab17d321