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