Fixing test runner.
Attempt to implement issue #10