Merge pull request #23 from velour/dev/eaburns

Add tests based on examples in the spec.