Fixed tests

Change-Id: I7646e2c087a944331f9303c7d90ab10ad643e7a5