Small simplification of tests.