improved performance of CLI fixture tests