Misc test fixes