skip tests instead of commenting them

When tests are commented, they are more likely to be forgotten, since
you have not notified that they are being skipped
test tweaks