Some additional spec refactoring