fix schema for merge output + simplify tests