Tweaks to unit test.