Added more Junit test cases to add more test coverage

GCP-9948

Reviewer: Mae Turiana