only page back if we got a new entry
update tests to not use old next variable