Skiptests

Change how tests are skipped. Rather than checking to see whether a test should be skipped when the test function is defined, check to see whether a test should be skipped when it executes.
Good point. Having fewer return statements is generally better. I'll refactor my code, though not quite as suggested. I don't want to add more code into the `try` block.