Added two-table tests