fix failing functional tests