Tables tests & fixes