Fixed bugs with construct_dict_list. Added a few more minor tests.