Fixing and adding tests for link interpretation