Refactored expectations out into a class