Re-worded a couple of error messages
fixed tests
Merge pull request #29 from drslump/reworded-some-errors

Re-worded a couple of error messages