Further simplification of tests.