Need some finer grain tests for DI. Lick and promise is not so great ATM.