Implementation of the tests for the dictionary and some minor modifications.