Ashwin/Melanie | #3007 | fixing functional tests