Update test runner.
Merge pull request #213 from dstegelman/bugfix/test_runner

Update test runner.