Minor test coverage improvements.