Remove setting in tests using NoneGateway