Add tests for more complicated table structure