some spec refactoring