Added more cases to the test suite