More misc test fixes