Preserve original tab labels (and fix tests)