* Fix unit tests to work with this stricter version Change-Id: Iaf6d333e4b4df54ddc340d261ce28538bfa1f3cf