Minor changes to test. Cleanup/Additions to kmeans