Updated templates, code and tests to account for new structure of links_...

...data