Fixed limiting on multipart rquests

Added tests so further mis-refactors don't happen.