cosmetics...
Fix copy tests to use decorated_iterator