More test updates for 100% coverage.