Adapt to delite/deliteful split
Fix test