(#7) Simplify some of the spec tests.