Refactor controlled spec