Added more tests to cover use cases