Added betweenness and closeness calculation, and some tests.