Cleanup variable names in tests