Fixing some more brittle tests