Fixes and updates to test runner