Merge "Fix bugs in TestWakeupClientServiceImpl." into main