Made changes in kernels + tests.