Fix incorrect tests
Bug #7262921
Bug #7198966
Bug #7203333

Change-Id: Iaf8d1ae0cb2440e479d1bb24145e223045624246
3 files changed