Added several new test cases