OT-support added for hierarchy tests.
3 files changed