Addresses comments. Renamed variables in tests