Follow-up from "Workhorse: allow testify/assert"

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