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

Improve spec tests