As a followup to TRT-1702, include the correct TestID in the return data. This involves updating the various dynamic queries that feed into the return data which are rather complicated.

This refers to the integer TestID from postgres only. There's a mapping for this to the string TestID from BQ data in test_ownership but more discussion and investigation is needed to understand how that might tie in to this report.