Fixing CliPluginTests and CleanupOperationTests