Add missing test check

Change-Id: I172dbac682ef2351f5bfca73c98097cdc6a84f1d
Add more tests

Change-Id: I82c8d50f23de2c00e723eee1b4f7b847ce34ff9e