More unit tests to improve coverage.