Normalize tests.

In preparation for #219 and #22.