Using the latest xunit skip condition attributes to skip tests

Also moved all the helper code into sub-directories.
Removing an incorrect test variation.