Dictionary file encoding fixed, two helper methods added, test specification updated