Add a combination test for FilePersistence::Diff