WYCS: more tests and more bug fixes.