fix err in merge
refactor of test-runner