Update CMakeLists files.

  - add the "simple" subpackage
  - add "fixture" and "main" to testing/lib
  - track rename of "test_matrix" to "test_matrix_vers"