WYC: went through and checked all extended invalid tests.
WYC: additional tweaks.