Tweaks
Missing tests