Tests and Tweaks