refactoring LateBindingMethodQuery
refactoring LateBindingMethodQuery and adding more unit tests