Revert "Strange errors. Guessing based on line no.s that the cause is to do with the skipUnless decorator"

This reverts commit a72521a461d94e8d1d21eb95dbcd6bd565aa4908.
Removed erroneous skipUnless