WyC: some minor tweaks to broken test cases.