Some cleanup and added more tests for creating new vertices