WIP improve registry doc and tests.

Change-Id: I3870a75f933e2840abd8ffdbfbb99fad277a8030