Some test related tweaks