extra test fixes