Do not pass simulation to yielded test as it introduces a side-effect
Fix test_jsons
Simplify code