[TIMOB-13685] Bug fixes in the test harness