fixed some variable naming issues in tests