Change variable names and location in test file