Adding more tests

Change-Id: I2dbbab083542de1a173273e668cfc41f8e77175b