Add test-id as a separate property in json output.
Make us of test-id in json output.