Fix test runner, not sure if its the best way though...