Simplify and speed up testing.