New hierarchy using tests.
18.0.1