DC | #2693 | fixing functional tests