Fix typos in Main entity
Update fixtures to the actual state