Added tests; fixed rounding
Merge branch 'refactored-vertices' into refactored-vertices2