Why do you modify test_data_layer in this PR, that should be in a different PR