Initial commit of test_gateway
several changes made
several changes