Add more tests

Change-Id: I205b5478e333fe9ad0920471d6356adec40beaef