collapse a lot of tests to be more idiomatic

This one is more of a style thing, but it prevents the array of "goods"
and is more idiomatic.

Now with less brokenness!

Hopefully this is an improvement in style, but feel free to ignore/close if you don't like it.