Simplify a few tests.