Fixed the helpers and its unit tests to fit the Entity behaviours.