Fixed test entity model, improved test field names