added the trie, renamed tests