Removed all references to TestFactories

Just getting used to using Pull requests