Restructered convolve a bit and added tests for the other classes.