Changes to adapt to JSON Message from System Test