[Tests] minor cleanup