I've removed the old way of writing tests, and added a more generic way of
generating those tests. The diff got all messed up, so I committed
everything at once.