Added acceptance tests for the gateway
Gateway config can now be controlled from code
Making the gateway test use the old persitence until we can merge in the
gateway changes from Chris