Revert kernel test bit. Add cli macro to exception handler.