reorganize tests so we can add some C++ ones