DRY the unittest even more.

Also, test a greater combination of types than before.