unify variables for test

Change-Id: I4e6ccc98117cb15821900eefd36e2b3408167e8a
2 files changed