Restored full test coverage.