Updated test to include all the tables