[tests] working on fixes