added test for SHC
fixed bug in cluster assignment