Reflect changes in the library.
Add some CMake output.
Work on CMake in tests.
Improve a test.