Refactor test skipping
Refactor skipping