Updated the tests to remove some variable names that are no longer used.