wide-ranging request and response changes to increase usage of better-implemented spring mocks.