Further tests/changes following comments by @cdeil