Updated simulation tests