Remove hard-coded URLs from templates(tests pass)