Add test case for GH-731
Use ID lookup for ambiguous helper evaluation

Final change for #731