Further test fixes