Fixed a bug where a body containing a single "0" will get mangled, and updated tests a bit.