DC/Melanie | #0000 |fixing functional tests