Better dealing with skipped tests