Renamed variables in helper to ease writing of new tests