More additions, tests and simplification of the example from the UNO docs.