Spec refactoring