Merge "Make the root/unroot test more robust."