Revert "Punt mocha too"

This reverts commit c7c95620a9e28b89c6247cce873cdfc5902b747f. Let's write some
tests.
Don't insert empty text nodes
Add unit tests for the ztext parser