Clone data criteria using Marshal to fix tests