Minor test tweaks.