Tweaks and tests