Tweaks and extra tests