Callback tests and markup tweak.

Closes #9 and closes #7.