added support for more classes to cluster_simple_test