Make test + cli util