Unreviewed gardening, rebase table tests after r159848.