Shave off a couple of lines
Make tests use top level header
Add methods for dictionary enumeration.