Refactored ClientId classes to achieve 100% test coverage.