Update the previous test-runner into an async safe test-runner