Make sure tables are registered correctly

It remains to check the results