TST: cluster: cleanup the hierarchy test data
Merge pull request #3874 from richardtsai/hierarchy_test_cleanups

TST: cluster: cleanup the hierarchy test data