some spec refactorings