Minor unit test tweaks