Add TestOperator to the main workspace of user_with_workspaces
Remove WorkspaceMergeEntry
Little clean up of packageCloner