Tests with more detail
Factor convolution into separate method, ready for benchmark comparisons.