Merge "Add tests for A1ClientFactory"