Restructuring Unit test cases #1
Added Unit test cases for some missing scenarios