Working on DirectGateway tests