clean up some more tests for Diff