some refactoring, abtestcluster assignment to be fixed