Test+CMake: Make our test grouping more fine-grained.