Added a test suite and updated some of the test cases.