[#14] Fix failing tests around templated uris