WYCS: more updates to the tests to reflect newer syntax.