dice: adding some tests, simplify a bit.