Story #1736: Flow adjustments (forget updated test servers)