Fixing the tests

Change-Id: I0f10a51067154522f355f49f7403fa3a067381f3