spec: Added more factories