Trivial cleanup while reading the code

I changed the Test* classes to *Specs to match my existing paradigm. I
am willing to change this paradigm but want to stick to the same
paradigm one way or another.

Also, I don't know how you got away with the two-space indents. I didn't
think Python let you do that.

Also there was no real reason for me to change those defs to lambdas. It
just felt right. Oh well.