Refactoring some expectations.