Update various tests to use a better skip mechanism