Merge pull request #20 from Ry4an/master

Tweak test harness to handle failures correctly