WYCS: added a few more test cases.