fixed test runner
(cherry picked from commit 2b60c6ec8f580750c372b03e82bda49fb9bc60b2)