Added more to the AcceptanceSpec, and dummied them up in the factory