Add sync and async wait for client
Add ct-based tests