Bring Simulation tests into line

See title