Fixed testTriangleType test data after Type Change
Merge branch 'dev'