Fixing some more spec/tests, adding new tables to hub.