ExpectationBuilder refactoring