try to fix tests, but figured out a problem with gateway