Better tests and real multipart/form-data