Fix the tests

Change-Id: I4c58697acaf696ca569dc0d05128f682275d304e
(cherry picked from commit 4129e6f6ac311d6f30072981a84b2b3ec3541da1)