Functional test fixes

WCM Team