Add UC Factory for testing