WYCS: minor tweaks
WYCS: minor tweak
WYCS: making progres on invalid tests