[WIP][DD-886] adapted usage/ entity creation (made POJO unit tests mainly working) pt. 3 (tbc)