WyC: fixed up some broken test cases.