rewrite tests to fit new kernel