Tweaks for test