add missing break and fix gateway config test var