Fix tables for tests pass