test...DumpBinding: misc small improvments
test...DumpBinding: misc small improvments

NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity