Some code coverage adjustments, and added a new failing test case discovered from it.