Simplify test suite.