[Argha] small refactoring for functional tests