Fix failing tests and add support for {$value} to bypass HTML encoding

Addresses #86 and fixes two failing tests.