Tweaks to unit tests.