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