Cleaning up UriTemplate as this is now an opt-in and not used by default
Adding missing request factory tests