fixing more functional tests