Updated kernel
New tests