Fix test on systems without certs
Fix gateway