* Fix issues related to -Werror * Correct the skipped tests
Change-Id: Ie2ec1c7dabdfedbe0bd36fd2525df7dc9d9ba2e5