Merge "Modify Include/Exclude tests in builCts.py to be explicit."