Re-enable 3d and time_convolution