Fix for issue #3945, and fix for PUT with request content

Small fixes to make the `AbstractControllerTest` more useful.