Minor tweaks & test fixes