Add additional tests for Simulation