TST: cluster: some cleanups in test_hierarchy.py
Merge pull request #3766 from richardtsai/hierarchy_test_cleanups

TST: cluster: some cleanups in test_hierarchy.py