Minor test tweaks