Fix tests part1

Change-Id: I865af3766b828e51646a11da1dc59dfad5ec8060
println

Change-Id: Ie012976c27e9e6b2c27a1c5da3718aa016fbf193