More test case fixes for #65 (no more complaints from Jenkins!)
Merge pull request #70 from untergeek/do-snapshots

More test case fixes for #65 (no more complaints from Jenkins!)