RE #27779 Fix data handling tests

Should have fixed these as I went along, but I'm not sure where they
failed to fixup the commits. Most were introduced as a result of
handling the checking of the plot box when repopulating the table.