Added new test cases to test new functionality.