improve test driver to cooperate with omakefile changes