tests-extra: Minor improvemen