Added default table names to fix failing unit tests