Fixes the dict comparison in the tests

Get rid of the dict_equals func + various refactoring
in accordance with the languagepack create test

Change-Id: I7a8a4dbe123e84c7d32deeed3eedae1fd617458c