Improving test coverage a little bit