Bugfixes: Trie implementation

Unit test code coverage improved