Minor fixes for tests

Change-Id: I735b56dece7a53b77ed25afaf93d706c394fe68e