Work on test suite.