Added support for HashDict and HashSet.
Organized the splitter tests better.