Moved Test.cpp to Simulator.cpp