Fix handling of skipped tests