Brought down some tests to kernel level