Added more test cases to unit test