Fixed: cluster based sample test