Dev; Added test cases