Rebased ::API; all tests pass
All tests pass for the sync Client
All sync test pass, some async tests still fail