Made some tests and integrated the simulator class