Modified Gateway to use the mock queue in during testing