restore and fix sync/async tests