More test coverage of odd cases.