corrections

Change-Id: I4b7ecb2c3cff01ca0e280b2213b8444aba4225a8
fix tests

Change-Id: I353d8dc2deba340a71ecb939117e2f5cf09b3909