Slight refactoring of specs.