Modify factories and remove fixtures