[Argha] still trying to fix failing functional tests