Implementation of the tests for the dictionary and some minor modifications.
Merge branch 'master' into stage_1