commit e841bac4 seems to have mis-merged the
change to reporting skipped tests.

I didn't check if there were other merge issues.