Improved spec scripts