updated testing & EntityList