Some small test tweaks