Rewrote some multipart tests