Change to table, more tests.