Second attempt at using custom data_path sometimes in tests