Added tests for the simulator