partially fix failing functional tests