WYCS: adding more and more tests...
WYCS: still adding tests.