Some test tweaks