refactoring
entity: getEntityByModel
model: new test design