Clean up test classes

We're constructing test classes from mixins in a bunch of places when we should just be using some preconstructed base classes. (This work is factored out of some stuff I started to do in #246.)