WYCS: more minor bug fixes
WYCS: added support for field of tests.