Making the spec more reusable