jump-to-def fix + tests