Refactored specs.