WYCS: more tweaks.
More classifications for verification tests as well.