Refactored spec.