misc test fixes