Fix for manual plot tests - pick up cmap correctly for standard contour plot and use updated syntax for specifying cmap.