Improved spec coverage