Improve spec tests
Merge pull request #28 from ghoneycutt/improve_spec_tests

Improve spec tests