Minimal Tweaks + Tests