More unit test tweaking.