Fix test issues for multipart/form-data