Fixed test runner

Change-Id: I4831d5754d52b4005ea623688a1f1c8c6d446d28