HEMERA-3400: Divide; Adding tomorrows test cases
HEMERA-3420: New layouting for gateways