Fix for tests using global assert

Change-Id: Id8da678d9a207ff7876e9450ec026773f2f091fb
Merge "Fix for tests using global assert"