WYCS: bug fixes
WYCS: various fixes so tests work as before.