Tweaks and Trie tests