Index: tests/sync-tests/check_sync.c
===================================================================
--- tests/sync-tests/check_sync.c       (revision 2235)
+++ tests/sync-tests/check_sync.c       (working copy)
@@ -586,9 +586,9 @@
 START_TEST (sync_easy_conflict)
 {
        char *testbed = setup_testbed("sync");
-       system("cp testdata data1/testdata");
+       system("cp new_data1 data1/testdata");
        system("cp testdata comp_data");
-       system("cp new_data1 data2/testdata");
+       system("cp testdata data2/testdata");
 
        OSyncError *error = NULL;
        OSyncGroup *group = osync_group_new(&error);
@@ -660,8 +660,8 @@
        fail_unless(num_mapping_conflicts == 1, NULL);
 
        fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
-       fail_unless(!system("test \"x$(diff -x \".*\" data1 comp_data)\" = \"x\""), NULL);
-       fail_unless(!system("test \"x$(diff -x \".*\" data2 comp_data)\" = \"x\""), NULL);
+       fail_unless(!system("test \"x$(diff -x \".*\" data1/testdata comp_data)\" = \"x\""), NULL);
+       fail_unless(!system("test \"x$(diff -x \".*\" data2/testdata comp_data)\" = \"x\""), NULL);
 
        char *path = g_strdup_printf("%s/configs/group/archive.db", testbed);
        OSyncMappingTable *maptable = mappingtable_load(path, "mockobjtype1", 1);
@@ -2757,7 +2757,7 @@
        create_case(s, "sync_setup_connect", sync_setup_connect);
        create_case(s, "sync_easy_new", sync_easy_new);
        create_case(s, "sync_easy_new_del", sync_easy_new_del);
-       create_case(s, "sync_easy_conflict", sync_easy_conflict); // TODO: test case is missing
+       create_case(s, "sync_easy_conflict", sync_easy_conflict);
        create_case(s, "sync_easy_new_mapping", sync_easy_new_mapping);
        create_case(s, "sync_easy_conflict_duplicate", sync_easy_conflict_duplicate); // FIXME: conflict handler duplicate is broken
        create_case(s, "sync_conflict_duplicate2", sync_conflict_duplicate2); // FIXME: conflict handler duplicate is broken