Functional test fixes

Functional test fixes pending to review