Merged changes into ShapeUtilsTest