WyC: various fixes to the test cases