Add test for batchable for optional tables