Fix typo and write Entity tests