Significant amount of work converting to hspec