Merge "Fix make test exclusion bugs."