fix more tests

Change-Id: I8170342efc4d3795a01863258bea295933f2954d
fix tests for behavior change

Change-Id: I6f8f12fda738176b400d68955ece1cbc40505e46