finish up gateway integration tests