Improvement/3.x/testapp executor simulation