Switch to using UserDct as the base object for Contour.

Also adding more test coverate.