Revert changes to data_test_client.go