fix functional tests
Merge pull request #1049 from ekashida/fix-functional

fix functional tests after refactor on tunnel