cleanup data_layer, add prefetch_rng_ field to it and use instead of
rand -- seeded tests still fail