Renaming some of the test helpers
Unit tests for Trie
Tidying up; refactoring test assertions