Merge pull request #20 from brianjmiller/master

Improve test setup