[#1735] Fix TypeUnbinder test the wrong class
[#1735] add return to unbind method