More spec refactoring