Fix retally for empty tallies and update tests