Slight refactoring of specs