Change-Id: I2f6f6c4bac539e8523dd82cd372ecce19dfd5251
Fixed tests