Working on fixing first test for downstream then upstream sync order