Minor test adjustments [ci skip]