Aligned combination of DataSource and Storage. Some tests are still broken. StorageTest and TableTest are updated.