Minor spec refactoring