Deprecate old simulation code
Fix test, new behavior introduced a few commits back