WYCS: tweaks to test cases.