More contract corrections.
Get test working with contract checking enabled.