Arvind work

Test cases and some more working stuff