Refactored expectations.