Added test skipping logic