When bringing in a qualified name, do not use it in the FunBind definition
Updating test files