WYCS: added more tests, some of which are quite difficult.