Simplify the tests.