clean up numeric expressions in test

Replace numeric expressions with constants in tests
to make code more readable.

Change-Id: I42469cdbe3cafd36f8d9855c8284f885ffa7f465
Merge commit 'f709c9d3db7578afd2c05f723f9bd4160e1c80d8' into HEAD