Added extra tests

Change-Id: I15bf52a0ed18054454838e30221fca258669bc70
Merge "Added extra tests"