Copy and Move Test fix