Updating variable names and adding to smoke tests

Change-Id: I505a1ba28d8ebb13eb833dd8dd109f77d65d1f6e
Merge "Updating variable names and adding to smoke tests"