Some further tweaking of test scripts for non face version.