Refactor Sandie specs