Fix factories and, thus, failing tests