Merged conflicts resolved
Kernel test added