more random test fixes