Updating variable names to express meaning
Updating failing test