ECDR-46: Added/updated unit test coverage.