Initial support for testing wycs.
Minot tweak