Minor beefing up for dup testing