Fix kernels and add test