fixed failing functional tests