Update unit tests for entity