Improve test skipping functionality