Improve coverage for #187