Adding test cases for more coverage

Change-Id: I92a25f2348aae1100af8172c9db70ab34b1595c1
Merge "Adding test cases for more coverage"