[tests] multiple improvements (#12294)

Commit

4 years ago

[tests] multiple improvements (#12294) * [tests] multiple improvements * cleanup * style * todo to investigate * fix