Improve Unit Test Coverage

## Improve Unit Test Coverage