WyC: still more test cases being updated.  Phew, this is hurting my hands!!