TST: filter out RuntimeWarning in vq tests
Merge pull request #3762 from argriffing/vq-sd-zero

TST: filter out RuntimeWarning in vq tests
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