FIX tests for correspond with bug/1282983

Change-Id: I3a981e82581a52d20d6d640ac568613919822207
Partial-bug: #1282983
Merge "FIX tests for correspond with bug/1282983"