Added new tests
Merge branch 'kernel'