Improved comments and tests for restoring root