test fixes [ci skip]