Add full unittest coverage.
Add full unittest coverage.