test: Merge *cmp.test into *.test to allow parallel testing
13 files changed