Cleanup in MakeGlobalVariablesScriptHandlerTest

Change-Id: I5e4da38479b08cf9580ed428f3ba7dce0de1d7f3
Merge "Cleanup in MakeGlobalVariablesScriptHandlerTest"