test fixes for ci