Small test tweaks