CMP0118: Fix some tests and add more tests
84 files changed