Merge "Revert "Revert "Test eventuallyExpect"""