Updated ShapeUtilsTest after merging from remote