Tweaks and a few more tests