Port convolve test refactor to master. Brings f03e238f to master. Change-Id: I7f7754e7d1288b103a4510303d10afc68a7d8ca8