Update to entity and test case