Fix Gateway __init__;
Fix Map creation in tests
Misc corrections