a couple of small test cleanups

I started looking into Rails 4.  Not much progress yet, but here are a couple of small test tweaks that I found while faffing around.