Fix factories and specs