Modified tests so that they can be run in the xbob.db.aggregator.