Clean up the test suite.

A couple things didn't have tests, and a couple tests were in the
wrong place.