Remove use of UriTemplate in MockMvcRequestBuilders. Rely on UriComponentsBuilder instead. Decode query params before setting them on MockHttpServletRequest. Add more options to model result matching for the count of errors. Ignore white spaces and comments when comparing XML.