some specs refactoring