Updated spec and factory