Improve spec testing
Merge pull request #48 from ghoneycutt/improve_spec_tests

Improve spec testing