Check in of fix for converting test data to JSON and old Simulation
class