Diff test fixes