resource_uri and home_link refactored, added tests