Improved spec coverage.