Working on test suite.