add more diff tests and fix set diffs