merge+test fixes