Tweaks for unit test