partial test fixes