Clustering now finished and tested. Test file added to reduce changes in main classes.