Fix a couple more tests

Change-Id: Ia0c14b8bf262dc1d42489c5ea7347124aa4fa887
1 file changed