expand cmakelist, eaiser for me tests