Unit tests for hierarchy refactoring
Unit tests for hierarchy refactoring