Reformat the test to be easier to follow
Improve the `remove-vertices'` for unweighted undirected graphs