Gateway: express fixes
unit-tests