Correct flows to include correct syntax and correct tests