Fix simulation tests