ignore empty tables with tests, minor cleanup.