Minor fix for keeping trie clean.
Repotted tests.