[WIP] Add some more tests, design table-based tests