Investigate and fix bodyclose reports for test handlers

The following discussion from !546 (merged) should be addressed:

• @jaime started a discussion: (+1 comment)

  question: do we have an issue for this or are you planning to work on them as part of this MR?