cleanup of test_runner, lib #32