Minor refactoring. Added tests for FileSystem
Trie addChild bug fix