Added Tests for Simulator