fixing functional tests