testing fixes
Merge pull request #220 from jpecht/master

testing fixes