WYCS: updated all tests which are now passing.