additions to tests
Merge pull request #364 from benjchristensen/tests

additions to tests