Added more functionality to the test suite.