Add some tests for the gateways