[Fixes#81191336] Final test passing