fix tests for passing in data_path"
merge