oops - corrected conditional in skips and moved config-dependent code out of setUp