Reworking test_simulation