More unit test tweaking