Updating tests for better

Change-Id: Ib08bb4533846e1d8a3c2b1e222d698226bb395b6