Tweaks for unit testing.