Rollup to test_data completed. Rebuild db reworked