Fix last simulation tests