REFACTOR All entity filling and expectation into shared/entity code