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