Add more to testing suite.