Updated trie test
merge