unit test tweaks