fix a couple tests
Merge remote-tracking branch 'remotes/origin/plip-13260-cpy-removal' into plip-13260-cpy-removal
more test fixes