Also made several variable renames in the tests. Change-Id: I675826f2510b6690f6008fcbce9e08ad610a4fa1 Closes-Bug: #1614551