tests: Conver: slight refactor to make code easier to navigate
tests: Conver: slight refactor to make code easier to navigate

krzyk240/simlib,krzyk240/simlib,varqox/simlib,varqox/simlib,varqox/simlib,varqox/simlib