KMeans2 tests and fixes