Add more tests

Change-Id: Ie0e0e3906edaa278805917e6303b1d5f1daba864
Merge "Add more tests"