Factories updated to make spec pass
Match form updated