test and cmake build updated