Improve test readability

Change-Id: I588d6e3989992789193e0c97d6215af745c88899