Repair tests for CopyCommand / UnloadCommand