Revised test suite.