Test updated to work with gateway