Minor tweaks and add a Python test for coverage