[tests] Minor fixes