Tweaks for testing