Kernel rework Part 2 in testing

Change-Id: I64831c29482d2b4c32ab083a501b7771a47ab09b