More tweaks to the flow controllers tests