Continue updating unit tests and modify ROOT_SCHEMA.