Add examples for chapter five
Adapt matchers to be more implementation-agnostic.