Test suite simplified.