more tweaks on test files