update test-runner
refactor test-runner