Merge "Port convolve test refactor to master."