fix deid tests
add shuffle to convert_deid.py
deid v2 data