fixed error messages and tests
Merge pull request #79 from swansond/timestamps

fixed error messages and tests