Fix after Entities CRUD testing