More work on table tests