- Code cleanup in the Client
- Added FactoryBase to support mockable factories