Fix TrieMap tests a bit