Fixing the broken gateway test