Added contour testing