Refacted spec