Putting factories in spec directory, closes #2