Refactoring. Added stubs for tests.
Added tests for Trie
Trie test edits
Minor edits