move mock to gateway options