Added test-cases for the latest change