Update binder resolver; update test cases; fix bugs