Tests tweaks