merge test fixes