Fix bug @tixxit noticed, and take @rklaehn's advice.
Fix bug @tixxit noticed, and take @rklaehn's advice.

This commit also cleans up the file, and ports it over
to using the new shared SpireTests/SpireProperties.

guersam/spire,siddhartha-gadgil/spire,siddhartha-gadgil/spire,rklaehn/spire,rklaehn/spire,tixxit/spire,codeaudit/spire,adampingel/spire,kevinmeredith/spire,non/spire,JackSullivan/spire,adampingel/spire,kevinmeredith/spire,non/spire,guersam/spire,JackSullivan/spire,codeaudit/spire,tixxit/spire