UnifiedContainer clone fix + test