De-listing

Not for merging yet.
the new tests with a table.