fix testcases, fix dics