Adding more test cases

Change-Id: Ib60f5780adc33fdf6235aaf812fe31367673bb3c