Slightly chahged triangulation
Added tests for triangulation + minor updates