Minor tweaks

Just some minor tweaks and some testcase additions.