Cleaned up, added test for kernel extension