Preserve parentId + test