Remove `WaitForResult` from two failing tests
Remove TODO comments