Add a function to skip remaining tests. Many tests skip tests for

Add a function to skip remaining tests.  Many tests skip tests for
various reasons but not in a consistent way and don't always clean
up, so add that and switch the tests that do that over.