Minor tweaks and new test