rewritten spec tests
Merge pull request #10 from Phil-Friderici/rewrite_spec_tests

rewritten spec tests