fix tests busted by -R change in flow