Reorganizing test sources
Bah
Another test
Fixing failing test
Fixing CMake testing configuration