tables.sql adjusted and all discover tests passed