re-added 'lost' gateway tests
fixed test
Merging master