Anishek /Ashwin | #2076 | Adding more test cases