Fix some broken tests
Raise SkipTest rather than silently eating skipped tests

This gives a much better idea about what hasn't been resolved.