Updates from usage.

Also added the TDD helper that allows easier testing.