CMake macros for testdirectories and new directory structure
Bump