Minor test improvments [ci skip]