Merge "Make test APIs synchronous"