Refactor spec
Keep refactoring