Finished converting to hspec