Added run_id as key on setting test state and status (used in cleaning up before running)