Further tidy up of test_edw_sync